fixes bad merge of name