Make merging a manual step

Instead of including the merging in the (automatic) tracking pipeline make it a manual step (see best practices)