Merge seems to have rolled back somethings, moved back to previous versions.