fixed capybara::ambiguous
Merge branch 'develop'