tweaked readme and fixed index conflicts
fixes another merge conflict