YUNO pass travis-ci build?
Resolving conflicts