merge conflict annotations