fix ignore
add diff and merge methods to schema
remove examples