merge attempt 2