2nd try to fix conflict