removed neutralization of \frontmatter
fixed merge clashes
fixed merge clashes