Script Merger Conflicts
This is a slightly verbose walkthrough of dealing with some less than simple conflicts while using Script Merger. In this walkthrough I am assuming you have basic knowledge on the utility, as well as a very basic understanding of reading a programming language (understanding brackets, syntax, etc.)