Merge Nikki's folder with Sean's