#42 fixes merge issues