I went to the Facebook app, set it to display all Facebook contacts (the second option) then proceeded to merge the normal contacts with the Facebook contacts... After that I went back to the app and set it to display contacts only (the first option). Works well for me, but could be a hassle depending on how many contacts you have and need to merge. Wonder why the app doesn't autodetect and automerge contacts with the same emails.