Fix conflicts take 2