create digger project
fix conflicts