parallax conflict resolved