Show view + comments etc completed
resolved conflicts