something happened during a merge...