added new merge code for password items