Additional conflicts resolved after repo update