new change in text
another change in r2
resolve merge conflict
r2 finish up