removed merge conflict in neuralnet