Added final links collection
Fixed merge conflict.