pull from remote master
 i solve the conflit