Added airline module.
Added help tags to Conflict2Diff.