Does this fix merge issues?