init: Fix some more mergefails

Change-Id: I6fbb230e0f0f4e93f25fb571ae2fb6ccfd12398e