for real this time fixed the merge conflicts