Fix merge issues with migrations