fix edit conflict detection