before merge
after merge
template - new