remove conflict file
Revert code