add first version of merge