resolve merge pb - FIXME : segfault