Corrections

Turned off sorting on the merge and got rid of the activityid column