merging masters on fork