301: Unresolved Conflict With a Sock – Part 6 (of at least 7!)