first commit and create tables and relationships
fix merge conflicts in git ignore