Fix merge "failures"