clean up after merge with origin master branch