added bad guy
merge