Resolve Design Conflict final