build hot fix for ie8
resolve conflict and merge master