Dealing with git issues. Trying to restore order to the branch