getting merge conflicts with inferredMetricsTieBreakers in Storyboard file

Question

Whenever I get a conflict in a storyboard file, I can usually resolve it. However, I have an issue that has now come up twice in two weeks.

At the very bottom of my Stor

Answer 1

Changed the metrics from Inferred to Freeform (Xcode 8, Swift 3). Solved my problem.