Resolve merge conflict
Resolve merge conflict
Add unit test for phantomjs class