Correct bad conflict resolution

Mistake was in commit 91cedc492dc9158b3cb1ee96a0055bbf9a880b67

Change-Id: I1178c15c8b2310455d1f12310a1ff0fe334487ae