some merge and ng.html add