resolve conflicts CPS