push origin master
fixed merge