Remove unused key importhistoryconflict

Change-Id: I50b0554bf3125e63e9d7de94d0ddcc553d19c3de
Merge "Remove unused key importhistoryconflict"