merging changing with local change which add handlebars syntax