Project compatibility with MonoDevelop
Fix merge conflicts