whoops! merge flotsam