Merge branch 'nd/checkout-f-while-conflicted-fix'