fix conflict

https://github.com/dryabov/twister-webkit/commit/bf8e0a8d022eeeb90ab7337
5bab105804c1792d1