get rid of extra newline
Merge branch 'feature-socks'