Fix merge conflict

(I'm still trying to figure out this git stuff)