I'm a fierce cow\!
Resolved conflict