fix adam's horrible merge. For shame