naw103/foremerge

Catch intent conflicts before code conflicts. The open-sour…