removing  merge conflict line
Merge branch 'master' into gh-pages