not sure what's changed
adds external README
fixes merge conflicts