Doing it in the right branch
Trying to log avaiable branches to get some clues why travis can not merge master into integration branch
solved merge conflict