fix some merge problems

Change-Id: Iaf96615d9bfc86c9efaccc9208c6dc1eb0e80da4