Remove all temporaries files *.rb~
Merge conflits