stash this
pre pull commit
getting ready to pull
fixing merge conflict
removing unused file