merge changes from live test