fix something
commit before fetching and updating with upstream