removing HEAD thing from conflict resolution