conflict suffix has changed
Show who modified conflicting file