never fixed a merge resolution