fixing the merge, removing unneeded m4/stamp (m4/ is not empty now)