conflicts detected spam message fixed
main layouts generated
other layouts generated
Merge pull request #20 from SixtusTheFifth/master

Fix of stupid 'conflicts detected' message when there are no conflicts