change the design
resolve conflicts