Merge branch 'sm/show-superproject-while-conflicted'