Honor code and imaging merge
trying to merge