cakephp and frontend boilerplate
resolve merge