cleanup bad merge

NTS: stop merging using Github Mac client. it sucks.