fix merge conflicts, something weird happened