Fix merge ugliness