merge dev with multiple pc's