Adds ClientMergeable

Will write the tests tomorrow.

closes #459