preemptively fix merge conflict