Hi, I am michael in branch dev
Hi, I am bob in branch dev
fix conflicts in remote branch dev
fix conflict between master and dev