Comments completed
Merging the conflicts