Merge attempt #2