the merge attempt 2