fix conflict from most recent commit