Still fixing merge conflicts

This is ridiculous