Resolved conflict
Working?

Late night… Maybe it works? Or am I just crazy…