continue on workitem1
working on workitem 2
Merge branch 'work1' into work2
merge and solve conflict