another attempt to clear merge problems