Mention [skip ci] in CONTRIBUTING.md.
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
Created by: axilleas
And since there is [skip ci] in my commit message, travis is not triggered 
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.