On last push, merge ugliness