Merge conflict (revisited)

Comment here.