activation function
fixing merge conflicts