(hopefully) fixed merge issues