Continue Merge After Conflict