update schema from migrations
resolving conflict in schema