i do web - resolve conflicts