merge of versions with template fixs and rearrangement of fields