Reject paths from conflict resolution

Paths ending in _(BASE|BACKUP|LOCAL|REMOTE)_($number).$ext are conflict resolution files. They should not be allowed in commits.

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