using hash to solve
Merge remote-tracking branch 'upstream/master'
remove unnec code