testing add then merge branches