oops, get rid of conflicted files