Added preliminary diff merger functionality

Change-Id: I7caae3f29ddc498ae2fa470059855e466f7f4c32
Merge "Added preliminary diff merger functionality"