Tried to deal with end of line
Merged