actually fixes the merge conflicts