If it is only one issue, wouldn't you mind do it on merge ?