fixed merge conflict (?)