fixed merge conflict (hopefully)

see title note