started make merge in controller