these are the conflicts that you need to edit out