I have no idea what you are talking about, what files have you merged? Explain what you did, in plain words.
Also there are tons of tutorials, a link would be nice.
Just install the 6.61 update and CFW Pro 6.61:
http://wololo.net/talk/viewtopic.php?f=17&t=41249#p376286...