fix resolution order conflict