fix merge, remove the callback as per master