Joe first webpagegit add .
Resolving conflicts when merging Tim / Joe work - config / schema