Custom config and .travis.yml were merged after "triggering custom build"

A post was split to a new topic: Ask for merge mode explicitly in Trigger Build dialog