Fixes merge conflict