Added same line as nick
Fixed merge conflict