New line at the bottom
Resolved conflict on bottom line