Fix conflicts in U2.W5.4