core loop
committing changes to core loop
resolving conflict in seed file