Fixes new conflixt