File:Gerrit-cant merge path conflict.png

Change could not be merged due to a path conflict! Argh!