update, fix merge conflict

test/built-ins/Object/defineProperties/15.2.3.7-5-b-174.js

test/built-ins/Object/defineProperties/15.2.3.7-5-b-68.js

test/built-ins/Object/defineProperties/15.2.3.7-6-a-44.js

test/built-ins/Object/defineProperty/15.2.3.6-3-100.js

test/built-ins/Object/defineProperty/15.2.3.6-3-102.js

test/built-ins/Object/defineProperty/15.2.3.6-3-103.js

test/built-ins/Object/defineProperty/15.2.3.6-3-104.js

test/built-ins/Object/defineProperty/15.2.3.6-3-105.js

test/built-ins/Object/defineProperty/15.2.3.6-3-106.js

test/built-ins/Object/defineProperty/15.2.3.6-3-109.js

test/built-ins/Object/defineProperty/15.2.3.6-3-152.js

test/built-ins/Object/defineProperty/15.2.3.6-3-153.js

test/built-ins/Object/defineProperty/15.2.3.6-3-162.js

test/built-ins/Object/defineProperty/15.2.3.6-3-163.js

test/built-ins/Object/defineProperty/15.2.3.6-3-164.js

test/built-ins/Object/defineProperty/15.2.3.6-3-171-1.js

test/built-ins/Object/defineProperty/15.2.3.6-3-178.js

test/built-ins/Object/defineProperty/15.2.3.6-3-179.js

test/built-ins/Object/defineProperty/15.2.3.6-3-181.js

test/built-ins/Object/defineProperty/15.2.3.6-3-182.js