missing templates added
solving merge conflict