first Commit
commit after first pull
after creating database
add database
solve comflict
change shop name commit