Hello!
While testing SF in Universal we discovered that on merge after you resolve a conflict you are not able to come back to your decision as you were in Desktop GUI.
I think this is pretty important since it means if you do something wrong and need to adjust your decision, the session must be rebuilt.
