Travis build file merge