added selenium tests
fixed merge conflict