Some sort of merge for resolve a conflict with blueit.ejs