Nicole volunteers for merge conflicts