still fiddling with setting up travis tests
fixing conflict