Resolved conflicts + edited \insertQR clauses