Adding field conflict checks for mgen-compiler
Merge branch 'master' of github.com:culvertsoft/mgen