Fixing strange, non-existent merge conflicts