Cowboy!! Yihaaaa!
Fixed conflict.