(Hopefully) fix merge conflicts