add create controller action
fix controller merge conflicts