fix committed unresolved merge conflicts from previous merge