continue cleaning
merge conflict
continue cleaning and start coding
starting refactor
error
continue refactor
continue refactor