welcome controller.
fixed schema merge conflict.