updated blog address and resume
finished merge conflict