1) Created another merge conflict to shoe David mergetool
fixed merge