Resolved conflict by including fixtures from both branches.