Fixed link towards the travis-ci.
Fixed merge conflict.