1st commit from branch dev
and simple
simple
resolve conflict