added show tags as per the hangout
resolve conflicts