neural_network addition
merge conflict solution