adding in dev branch
add a word conflict
add a word in master, diff from dev
fix conflict
Merge branch 'dev'