edit conflict file