create new branch tmp
modified the master before merge
conflit fixed