James changed README
james fixed README conflict