Ignore conflicted files.
Get template schemas. Some fixes.