Resolve conflict
feat(start): working but pending refactor