clean up dirty merge with 'upstream/master'