removed redudant markup
fixed merge conflict with Object.js
fixed merge conflict
fast forward