fix merge issues

git hub is so fun!