merge without bad head's

Change-Id: I704b6bd893275ffe9602ac14cf44209a0b3d9ed5