Creation of the first line
Fix conflict