Merge conflicts n°2