Attempt to fix conflict