local neuralnet has mismatch with repo
resolving merge conflict with neuralnet