Creating branch feature1
creating feature1 branch
Try resolving conflict
submit again
conflict fixed