how do i merge a fork