Fixes merge conflicts with PR