commiting changes to entire executethis process
attempting to resolve conflicts
committing executethis changes