Royal conflict resolved, says Jordan's King