Travis integration
changes
conflict solved