Somethings left over with the merge