allocate test updated
Making git stop complaining about merges