after merge segfault