correcting merge conflicts from rll3 machine