Master Conflict Resolution in 4 Easy Steps