grr.. merge error

Change-Id: I50a5cb164ce24e27996a88c048ed20e4ab1fc741