I have no idea what just happened with the merge

Trying this again