old edits
resolve edit conflict