Only bail for unresolved merge types in a couple of cases. Follow-up to bb18a03c. Bug: 27799205 Change-Id: If448e14036bc5e245677e0cd8cdddee02b320525