Cleanup and update README
Resolve merge conflicts