changed wild to fun
cleaned up conflict