Fix merge problem and filter out requirejs