Creating a 5ª line.
Fixing the last conflict.