Fixing bad merge again