Fixes merge conflicts (hopefully).