initial commit with schema
fixing conflict