I added the guy
Fixed conflicts