Zach's merge