Added tests and code for simple entity merging.