fixing loading problem with lazy.js, fixing bug in merge code