Attempt to fix scene 1 merge/conflict issues