templates added
merge