blue: fix few merge fail

Change-Id: I66230657485ecec179c75f589fed4bb71c104020