edit on dev branch
edited again on dev branch
edit again on master
fix conflict
edit on dev again
merge with --no-ff