init whatnow project
solve conflict