merge calvins