added merge support
added timestamp support for created and modified records