Removed merge conflict code.