Fixed merge errors

wtf