first commit joanne local master
2nd commit
resolved merge conflicts