Console Output

 merge branch WFA_101 into dev, conflict resolve