System to flag merge conflicts in councillor update interface. Make merge conflicts when there are some.
System to flag merge conflicts in councillor update interface.
Make merge conflicts when there are some.

MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg,MorusAB/commonlib-fmg