Removed merge conflict file.