fix conflict

should be able to run now