Made some progress on database table diff view and merge, but still its not finished