#45 fixes merge issues