set conflict on the correct path (refs #395)