fix merge conflict user
add job result views/controller/routes
merge style branch