resolved conflict _defer