tests sp
resolves conflict