many changes
renamed client1 template
fixing merge conflict