change create controller
merge resolve