Spelled out the first line
Fixed merge conflict
Fixed merge conflict