first commit
commit 2 : fix conflicts