fixed merge issues

lol