Merge conflicts resolved with joy. Who's Joy?
Now Joy is working for us.