Fix conflicts shit