Fixes merge conflicts