merge conflicts
minor enum to boolean error