Resolve merge conflict, and changed readme