merge conflict annotation