resolve a merge fail