merge with on no-ff
issure101
merged issure101
fix the issure102
merged the issure102
master commit
~ push dev
fix conflicts