Microsoft CEO Satya Nadella has decided to move the company's MSN group to its Windows division in a bid to resolve an internal conflict.

Late last year, rumors surfaced of a battle brewing between two key executives within the company over what the default home page on Internet Explorer for Windows PCs should be.

Terry Myerson, head of Microsoft's operating systems group, wanted it to point to a promotion for Windows 10. Applications and Services Group boss Qi Lu felt the page should point to Microsoft's search engine, Bing. Up to that point, MSN had been the default for millions of Windows PCs.

An internal memo from Nadella notes that MSN is now part of Microsoft's Operating Systems Group under Myerson. It had previously been under the watchful eye Lu. While work-related disputes are rarely productive, it's encouraging to see each executive willing to stand by their division.

GeekWire also pointed out that Brian MacDonald, who previously oversaw Bing Apps and MSN, is now in charge of productivity software in the Applications & Services Group. News of the change comes from MacDonald's LinkedIn profile.

Looking ahead, 2015 is set to be a big year for Microsoft as its next major operating system - Windows 10 - primes for launch. In addition to a new web browser and Cortana for the desktop, Windows 10 will feature the return of the Start Menu. Best yet, the new OS will be a free upgrade for most for the first year.