Resolve Dialog <enter> should open "Edit conflicts" - now it opens "Compare with base"
During the merge, after selecting resolve conflicts, we see the commit dialog. In the list of files (changes), for the files in conflict, "enter" should act as a left double click - open "edit conflicts". Or we should have some other keyboard shortcut for "edit conflicts," for example: Ctrl + "enter".
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information