- merge conflict code