Implemented link tags
Resolved conflicts