correct conversations controller
prep for merge