set up project in cargo
attempt to fix merge conflicts