[install-guide: 2/3] resolving merge problems