Fix problems with merge