add merge test to travis