removed merge conflict file