Removed auto-created merge conflict files