I would start from scratch. Rename your edited files, and change the original files by drag and drop from your custom files step by step. so you can see when the error occurs. is a bit lavish, but safe.
Sorry, that i can't help a little more.
Good luck my friend.