Updated readme to fix merge conflict