test merge of new merging functionality with auth functionality