fixed manual mvc project that didn't merge right