Almost fixed merge problems