fixes last merge conflict