fix merge - don't report confict if source is empty