attempt #2 after merge fail