fixed merging layouts so it actually workds (fixes #2), support include except with <merge/> (#7)