I was editing a Resource pack template and once I was done I started deleting things that I didn't edit, I logged on and everything worked fine but then I merged another resource pack with my own and when I logged on it crashed.
P.S. I made sure nothing was affecting the other in each pack

What I expected to happen was...:
It would open and I would have the features of both resource packs.

What actually happened was...:
Minecraft crashed, I think the Language files were corrupted

Steps to Reproduce:
1. make a resource pack and delete all of the un edited files
2. get another resource pack and merge it. make sure the files that were edited in both packs aren't the same. Also merge the Lang files for both packs.
3. Run snapshot 13w25c, it will crash.