I'm a bit confused here. It looks like the 2 files you want me to combine in step 2 are the same name in the same location.
The other thing is that I did do a site wide search in a previous interation of this site for those files and changed everything but at that point I couldn't get into the CMS admin panel because it would no longer take my login/password.
Is this something that I need to be on the lookout for when I do site development? As long as I know how to handle conflicts like this when they come up it just becomes part of the regular debug cycle but at this point I'm still learning all the goodies in Power Suite.