Migration merge issues