Design Completed
Conflict Resolved