committing and pushing to check for conflicts