first merge attempt