corejs merge conflict fixed