fix conflicts

should work now