Design the draft
Fixed conflict