adds schema to git ignore
fixed merge conf