Merge to prod only from master

In this merge:

The user choose a wrong source (feature branch instead of master) and production and master histories diverged.

Try to check the source branch when doing a merge

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