rm leftover merge pieces

Change-Id: I9c017d9b90c8cab3b53fcfbc343d1e83f35167d3
Signed-off-by: cj360 <ayunker551@gmail.com>