Tyrone has problems trying to resolve conflicts with modified files on his end
Tyrone resolves some conflicts in scripts
Tyrone tried to implememnt some js label scripts.. it was garbage, it was removed