There is a merge tool available in the final release of 7.0.