update the gitignore files, update the database stuff to avoid the <<<HEAD === >>>