Add missing meta's
Update gitignore
Update gitignore
fix conflict
fix conflict