Changes to RaycastParser
manage conflicts