WTF
Updated README
Fixed merge error