detect type conflicts as well as mergemode conflicts