EthanR: fixed merge issues (warn me next time!)