starting over with no conflict, just a commit and push