Removed redundant Google Tags code
Conflict resolution