Fix conflict.
Test travis-ci.