Fixed t3 headline link to t5 is broken
Conflict resolution