Brute force merge resolution (wait for next commit)