Final commit

conflict

My commit

My commit 2

All is ok

my first change

dfalksfj

my second change

conflict