Removed merge conflict backup