Fix build: fixed some merge derps