Fixed migration and merge issues.