debugging after controller/model/view merge