fix some merge sadness