My resolve conflicts