Trying to fix conflict problems