Resolved migrations merge