Fix style me controller
Fix merge conflict