vendor: Derp when merging

Change-Id: I9a8d1e33a1d2b2b625386cc75eec18dfce8ae3a4