removing remaining file of a conflict resolving

Change-Id: Ib17d7c978c8a8ea51f6b9d7e7ba82dd057247e00
Merge "removing remaining file of a conflict resolving"