change resolve order