added function prototype for join_tagged
tried to resolve more merge conflicts
more conflict resolution