fixed merge problems in main