hello.rb changed !
Merge branch 'khalil' and see conflicts !
hello.rb changed to make a conflict
Merge branch 'khalil' and this is a real conflict
all deleted