Fix further merge problems