Contents: One Unresolved Merge Conflict

Opening the design…