deleted controller for merge conflict reasons