fixed controller issue
fixed merge issues