fixed merge with yagg