Added additional checks after running merge tool