Merge angular + js