fix merge conflicts

need to figure out gitignore to get rid of log and coverage files