update of the template map
update of Member module
template conflict solved