Resolving a conflict for #1.