actually fixes merge conflict tho

title