Added a newline
Fixed merge conflict