fixes merge issues