restangular and folio controller
merge conflict