Whoa, this is some weird merging. Will manually revert to master version to be safe and replace the desktop page declarations.