inserted merge tag comments - no real change