Fix conflicts and console