committing specs folder - part done
fixed conflicts in schema