fixed edit conflict bug