udpates
resolve conflict and sort out according nav heading
added accordion updates