notably for complex list items that have id's ## references - https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
