merge for deploy: alpha solo gameplay