Resolve conflicts (AKSubmission views and translations)
Add merge migration
Fix owner slug migration for existing entries