Fix a wrong merge I made