Guild chat//Ally chat trhrough ! and @
Merge origin/master