issue #2277: Delete some conflict file and resolve some error