create digger project
fix conflicts
update database config fiel