merge attempt number 3