More fix to the merge

Signed-off-by: Philippe Ombredanne <pom@nexb.com>