Trying to fix the conflicts...