a conflicting edit that will require a merge