second branch
confilct resolved
final changes made for r2 in context