fixed merge mastermodel