Fork merge