another weird merge conflict fixed