fixed bad merges

Change-Id: Iae955218599fcd7a71f31711bd5933b25206582e