fixed issue where resolve check in finishMerge() was crashing if there were no unresolved issues