saved migration file
resolving merge conflicts