Removed merge conflict file