Docmntn for ray 1
conflict resolution
conflict again :(