take time in collab to show how to fix merge conflicts

use one of the many merge requests to show case this
GitLab can merge in Web Interface (which maybe depends on Ultimate), but we should exercise this

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information