Fixed wrong merge resolution