added tasmanian devil to zoo
resolved conflict
resolved another conflict