removed merge conflict code