Cleaned up fluidstack merge code