add a named f1 branch
add switch to master
confilict has bean solved