Last try to fix conflict