remove edit conflict