edit bug with merge and add get new order