initial revamp commit
adds push -u
updates merge conflict instructions
tweaks to revamp