Merge branch 'rr/checkoutconflict'