Fix slim with angularJS
Fix merge