Feature/352 contact merge

Fixes #352. Test included. 
Also, using the object creator class for the other merge tests.