I have some merge conflicts on files 'deleted by us', meaning some incoming changes target fi