third merge attempt