merging multi-gpu and dev